This reverts commit 1d46f4f2. Reason for revert: Did not fix b/159041693 Change-Id: Ie06232a06027a29ccd2e71ae866200f2e9216cbe