This reverts commit 8d22f138aa. Bug: 65225023 Change-Id: Id6c21682cafa86d87f66480237dd731b21f917c5
8d22f138aa
d72f5f7c9a