This reverts commit 2ace53c1. Bug: 12077632 Bug: 36849162 Change-Id: I433c9dd21b6ce3e10019e494fb9a134d913a8966