DO NOT MERGE Fix intent filter priorities am: eeb970a am: cd24c4e am: bd770bc
am: 7b068fa  -s ours

* commit '7b068fa903e7f10e4f693f67b432e3a88ba9b9b1':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ied039fa8044e28df0a5c63e9935a3bafe4fd2a62