Bug: 142979808 This reverts commit 821fbc83a1. Change-Id: Ibe426d3175b8b44fadaf78316201031f229d736e
821fbc83a1