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