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

Change-Id: I9d62acc0ab7fe4866082e675e1bea3e5f1fedeb8