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

Change-Id: Ia43904db88f27c5b6a2d9c79fa049f5811303dde