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

Change-Id: I58ffabfa3a4f4dccb4a3465186aa1b04115d053f