This reverts commit b6e2cd8546. Reason for revert: b/135567630 Change-Id: I4cd87356177a141c99e3865b8794de58386d0f49
b6e2cd8546