Revert submission

Reason for revert: possible culprit of b/145648579

Change-Id: Ic37da7ca4f6ba89adfa6a1707a0879ede72a6aee
6 files changed