Merge changes from topic "am-8c8bee2d460e4bc386053a41bc960993"

* changes:
  [automerger skipped] Merge "Remove the counter intent declaration since we don't need an intent any more" into tm-qpr-dev am: cd798dcd -s ours am: 41506927 -s ours
  [automerger skipped] Remove the counter intent declaration since we don't need an intent any more am: df3b7009 -s ours am: 58b9dd6e -s ours