This reverts commit d446b401. Reason for revert: b/194046224 Bug: 194046224, Bug: 169386435 Test: build Change-Id: Ic2877b2dfb6e3f33f6757585166b3c76c1ed3b41