This reverts commit 927ff798. Reason for revert: breaks b/184822622 Change-Id: Iac7f66037a705948ad66064636bc7d9d5cac8e37