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

Change-Id: I38d4ced5bc1fa3b820c5743fd046da95d3d5c9b5