This reverts commit 334968c113.
Reason for revert: Bug: 170280415
Change-Id: Idaa269406d6c1609c75f0dfba1f7fa9daf979101
This reverts commit 334968c113.
Reason for revert: Bug: 170280415
Change-Id: Idaa269406d6c1609c75f0dfba1f7fa9daf979101