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

Change-Id: Ideeda9cbd861a39649281b3f192f303820a4468b