This reverts commit e149f3c1. Reason for revert: This is ready to be enabled now. Bug: 36001741 Change-Id: I418d3a498ff0712ce9a1857924c6d0039026a664