This reverts commit e272b169. Reason for revert: b/124450605 Change-Id: Ib125444854026cfa6f5319ad4954d2dd1f35d6f1
mentioned in commit c4529320