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

Change-Id: I079546af5ca894bb79bfed08dc69ce9986bf7111