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

Change-Id: I23e565a2bee6d3183544024e33c1d9771503ebcf