[automerger skipped] Merge "resolve merge conflicts of 0cc0d229 to pi-dev-plus-aosp" into pi-dev-plus-aosp am: 7a6f5c4b -s ours Change-Id: I9b32f9ab08e8790011d379b7a3ba0ab7f9d09488