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

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

Change-Id: I7c17baf18e2d25c95fb5b8fa45f5cc7b5936723b