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

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