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

Change-Id: I8d67bbdc660cabea97dbd7700985cef986bc8b3b