Merge "Merge intent filters so intent forwarding works." into oc-dev am: dc43b64c54
am: 6f802c0af3

Change-Id: Ib0957812744aea02e9d4710c39ff3a7d300b0976