This reverts commit 65e8b6b3. Reason for revert: Multiple art-test failures Change-Id: I88ec4a1bd0b2370f409b2d8d9c4b543d4fa5b8f3