Merge changes from topic "am-08457016460a4b589f7df1cd8d8f5cbc"

* changes:
  [automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours am: 3e7ab1d8 -s ours am: 38c7b8c9 -s ours am: ef080cb4 -s ours am: 81a6574c -s ours am: 20b42f7b -s ours am: d1c3fcae -s ours am: eb4e61db -s ours am: eb85bb64 -s ours
  [automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours am: 9b2f1f26 -s ours am: a772442b -s ours am: 47eec46b -s ours am: c0aa4753 -s ours am: d16012a8 -s ours am: bc062a70 -s ours am: 1a7ed0de -s ours am: 11b78e9d -s ours