This reverts commit 461d91fe. Reason for revert: breaks git_pi-dev-plus-aosp Change-Id: I8a42dc040a112f0774f31486a8da2a26e1e68a30