2a1991a3a6
This reverts commit 09fbad47d822d7234d9e69b038ab45e7885a0cf1. Reason for revert: Re-Enable the tests Change-Id: I48e9e7f7e41084c8def0d46804a05dc17bdb5ade