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

Change-Id: If3f3c971fe7a5365479a9f73043d474f23cf6ba9