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

Change-Id: Ie80f27ad595c78a63ac754e4549f2679dd7ac500