[automerger skipped] Merge "[DO NOT MERGE] Allows the Assistant to request...
[automerger skipped] Merge "[DO NOT MERGE] Allows the Assistant to request suppression of fling" into qt-qpr1-dev am: fe399658 -s ours am: 1413c3c4
Change-Id: I0b16ab9b0a95025744cc0e25c31977227dcee271