This reverts commit 5d0687a2. Reason for revert: b/172663078 Bug: 169034951 Bug: 172663078 Change-Id: Ifb5f56bf5468969ad026f10186763ef604113adc