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

Change-Id: I81ab4bf8f87de74cc380df2088da262fda24bdc8