This reverts commit 1187590da3. Bug: 73134570 Change-Id: I59b4d714e447478ea124f086356f127f42251fb7
1187590da3