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