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