[automerger skipped] Fix pi-dev-plus-aosp build
am: e8febfbea3  -s ours

Change-Id: I92881350a6415d642678cd2eccd33644ddb8dd51