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

* commit '620a4ed031d807c6945d531d1a98374eba369449':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f