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

Change-Id: I14f624bb8a9974ae97c90dcae768512e5be16f5e