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

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