This reverts commit 5dd45ebc2b. Reason for revert: b/171022033 Change-Id: Iefb0edbca0254a9d7ee03175196152278e19a7d2
5dd45ebc2b