[automerger skipped] Merge changes from topic "wd-flags" into qt-dev am: 28c538d289
am: 66cc14a8a8 -s ours
am skip reason: change_id I7323dc65ec2957aeab128224864441bdf63c6f81 with SHA1 97d96c6149 is in history

Change-Id: I5f45b55e6269106e6a66f2ebdde446003b1af25c