Merge "[automerger skipped] resolve merge conflicts of...

Merge "[automerger skipped] resolve merge conflicts of 10edcaf6 to oc-dr1-dev am: f1d23b5b -s ours am: c7476c34 -s ours am: 879b385d -s ours am: 295302ae -s ours am: c6cd283b -s ours am: b3697c03 -s ours am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 9f78214f is in history" into qt-qpr1-dev-plus-aosp