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

Change-Id: I5c40623742c23696457c1fedb742322c634ed1f6