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