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

Change-Id: I707537e81448e49ceda10e6682a99aeb4eadaf4b