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