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

Change-Id: If7429831dbe28d7b995f8509449897d4f926be39