This reverts commit 0a8baca5. Reason for revert: causes failure on git_pi-dev-plus-aosp build_test Change-Id: I942a07070770f92babc2d9ae46096d61fad60497