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

Change-Id: I8eab1ae4d9ab23e40cbde35201572e1f695a542e