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