[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: I60bc0728de383b66b46871da53091dc65c0e2ae0