Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
am: f83b94aa0c

Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c