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

Change-Id: Ib6b587763991affb4e7e25034e4cda9b47b86051