This reverts commit bb9cef04. Reason for revert: broke pi-dev-plus-aosp Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68