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

Change-Id: I40bbc047442e15ea9417588d75ed4f94e9e38ac4