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

Change-Id: I0c2397ac0b2105defd4dc91ec4dc545bbe0f3b56