[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: afc30c847a -s ours am skip reason: subject contains skip directive Change-Id: Ia43920d5bb1d36aa3d9695905c714fde9f20a2cc