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

Change-Id: I2ab60aba52d989ac9f9be0343ee8f08e863700af