This reverts commit 0d75fdb4f7. Bug: T287542 Change-Id: Iedd3461869f973f8d621a39e6ad4674cbb577551
0d75fdb4f7