This reverts commit 739d952a81. Bug: 48703 Change-Id: Ib66ed3c824f0bd5e68258eb5a39b8affc8b50e9f
739d952a81