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

Change-Id: I322a73d69013f3883924a289ad72b9a62acb52b3