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

Change-Id: I5cd6d38e64ea80cd3570d8b30341771c18fa21a3