This reverts commit cb1b848084.
Reason for revert: Droidcop-triggered revert due to b/142849532
Change-Id: If81eba4e979e21202e78839bb1afbc66691098d2
This reverts commit cb1b848084.
Reason for revert: Droidcop-triggered revert due to b/142849532
Change-Id: If81eba4e979e21202e78839bb1afbc66691098d2