[automerger skipped] Merge changes from topic "dap_cuttlefish" into qt-dev am: 6d5a7236 -s ours
am: c14441e6 -s ours
am skip reason: change_id I246c38e08376c837b7f126aa19cb8c1d73ed1e26 with SHA1 8a66a71b is in history
Change-Id: I43db3136642011eac404a1727b6f60e4eb79a3b2