DO NOT MERGE Fix intent filter priorities am: eeb970a
am: cd24c4e

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

Change-Id: Idc3d639cd5494210f06f46b644f465be26eca9b1