This reverts commit 23ac9cb3e1. Bug: 28421447 Change-Id: Id04e7b7827d8b897b7c7992705d36f9d83a13320
23ac9cb3e1