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

Change-Id: Ie0d357b0be836ff0a60a79eccac0f81c01cf490c