This reverts commit d25bb60e05. Reason for revert: Breaks build_test b/152190149 Bug: 152190149 Change-Id: I6b7cb4aa4fc07fae648bcf4d9e8f60ea1c62fd9e
d25bb60e05