This reverts commit 5bca8b8c. Reason for revert: b/123166999 Change-Id: Ie0f29213d314159c55c487d7afbd7417db537fe0