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

Change-Id: Icef4a9d79b578d4f0fe55715b16190b4f60c6a7e