This reverts commit 07037dbc3f.
Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>
Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963
This reverts commit 07037dbc3f.
Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>
Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963