This reverts commit 0ac3cdfa. Reason for revert: Causes presubmit error Fixes: 124252294 Change-Id: I881b24a60dd3a98afb807264d1e4318127a8c91b