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