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

Change-Id: I3bbabef26e25368d1a828161efd2c4d32391d636