DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384  -s ours am: c2cc804  -s ours am: 620a4ed am: be58fe0
am: e265f35  -s ours

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

Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d