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

Change-Id: I1742d32e0a16ef0543a4fe0eb4ada2263a285577