476b686d67
This reverts commit fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45. Bug: 26616870 Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d