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

Change-Id: Ibd91e88e53afd8c45d2ee914d3589a8369801521