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

Change-Id: I12d8344e7febf06f133c62a17795bd4cfc5e1bfe