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 am: 3bdb89b am: b757575
am: d359c8a

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

Change-Id: Ibcaf0d28db2f332885b4ec9f8ee782e579f1b2b3