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

Change-Id: I7a651f7389dd3a4fe64ee8ad5225087422efc57d