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

Change-Id: I5207a13fa2997cad393ec60d5f0cfb93eecbde16