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

Change-Id: I3f0457d503c82b054be3288a19d878b9fc088623