Merge "Do not evict scan results in cold start." into oc-dr1-dev