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

Change-Id: I9e6a5cbfa0e9fde6b656366e91e2cf98b2e0748f