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

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

Change-Id: I03f00278d9ecd8d66a4f4a25cea6a4c4aa67cb67