This reverts commit 63d547915f. Bug: 52115 Change-Id: I1d6b65622e8a103a8a892beacf268e77b9e1b2d0
63d547915f