This reverts commit 84638af3. Reason for revert: b/121350025 Change-Id: I8ebffc7a01a9173043e6d9e16b7547476b57e4f7