This reverts commit f50593c447. Bug: 32973182 Change-Id: I5b14a812671ea02575cb452242ff1a6f05edb9c1
f50593c447