This reverts commit e9f47163. Reason for revert: Multiple art-test failures Change-Id: I550864c23485a438889ab73c7e4a877cd730cabb