This reverts commit 54fa3c5e41. Reason for revert: <INSERT REASONING HERE> Change-Id: Id90d8718b4b0db3f3831fb2dc82cae6aea6c9170
54fa3c5e41
Test: Built successfully Change-Id: I53d8a5cdd4bce6049707c09a284ebc145efeddc1