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

Change-Id: I40c3785dc05a51760b1fbe8557300029836c3306