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

Change-Id: I4d046c21f18e74a12b47c108e9a309cafca15ced