Reason for revert: b/35158271 Bug: 35158271 This reverts commit 2dfe92c2. Change-Id: Id04eab8100bfb0b3e137095b25b7d4b12c6d11e6