[automerger skipped] Merge changes from topic "resolve-merge-conflicts" into qt-dev-plus-aosp
am: a679b14e -s ours
am skip reason: change_id I93a0a624304b9f6f00aae600377a73b720900fba with SHA1 f293278f is in history
Change-Id: I5afabf80ade2438a66b5f66d8bd06c9a74cfc9f1