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

Change-Id: I0970b450a7cee1f54571073e78dc94822e478120