Merge "Filter instant <--> full app" into oc-dev
am: 4d3d035255

Change-Id: I519db1234ac4ba8acfe06c694f69fdf36eac1b6c