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

Change-Id: I7ae66b77d636b9b58f81c0b1858e976c1db5264b