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

Change-Id: I8c3bf3c496df0db5149c4aa8a95554a489864db8