Merge "Merge "Create a staleScanResults bit." into oc-dev am: d1094717a1 am: 7dd2635319" into oc-dr1-dev-plus-aosp
am: 3e8e8c3395

Change-Id: Idf481723aff1a8b7b6f01e5059c88f2cb0b0c5ce