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

Change-Id: I25432574defb32797210f18025972b906bd169b9