DO NOT MERGE Fix intent filter priorities am: d6174e7  -s ours am: ebb136c am: 6e0aff3 am: a73fa08  -s ours
am: d73c865

* commit 'd73c865385e2177055962d1015530c48556fd9f8':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ied6935ae9e523f7f824b45ab3057cab1717296d6