This reverts commit 3a150d69. Reason for revert: b/175743249 Bug: 124313442 Bug: 175743249 Change-Id: Id1695df7b83bf057511f856b40cf7d5413030270