fd11390a65
This reverts commit 170a067f27.
Reason for revert: b/132816938
Bug: 132816938
Change-Id: Ia03e30f892b2515e498fa20402a9e497340361eb