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

Change-Id: Ibf91df87e8659b8a088c188179e6649bccffdb85