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

Change-Id: I14d01d3ce51da142180a96718af07ad870037d06