773309717d
4fbd2f2252
Reason for revert: b/197866364
Bug: 197866364
Change-Id: I6b9be180c54ddb4999236a460c5ef4877fab535b