[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
am: 7cd8b83d0e -s ours
am skip reason: subject contains skip directive

Change-Id: I3ace4fa2f5c7c9bb7c1382ed8d7e129cc4a67aff