[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 12ca8b940d -s ours

am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 65ced1b1d0 is in history

Change-Id: Iab3d186b124796b3f6d2758654dad9c996180a09