Merge "Adds appropriate filtering for instant apps" into oc-dev
am: de5be11955

Change-Id: I7c4ea3c1bfcefa59cf0abedc3c5c1d8ec8effa08