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