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

Change-Id: I31d8d5257764ecd844c94b8595519770f568946d