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

Change-Id: Ic8f449741ebd7e0d59460ad745ff384bf3f13a00