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

Change-Id: Id39eba4625fbdfaced81706218da602ab89f249f