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

Change-Id: Ib8d1d593b8d79f87d83f881ceaade2263973742a