am b535c5e2: Merge "Start using some better sorting for intent resolution" into mnc-dev

* commit 'b535c5e28a7d689020461e9f9e8bed165eacc522':
  Start using some better sorting for intent resolution