Bug: 28621640 This reverts commit 1bf206b766. Change-Id: If8c85e4adeb017eec2b7e8199010deae2a920c6a
1bf206b766