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

Change-Id: Ic6e5a3b8f2a5d2bdc25e1e09dceedce3413dd100