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

Change-Id: I0509d61ba16b2919e7145e3763f7054c41464b87