This reverts commit 6c5bfcb40f.
Reason for revert: Bug: 179493042
Test: Manually verified
Change-Id: Iebcaa9e92a2f83419c07936aa5aa3c81970da34a
This reverts commit 6c5bfcb40f.
Reason for revert: Bug: 179493042
Test: Manually verified
Change-Id: Iebcaa9e92a2f83419c07936aa5aa3c81970da34a