This reverts commit d39600585b. Bug: 27665091 Change-Id: I7d017ba7062ac594225229436d2877c7d21fb065
d39600585b