Merge "ScanDetailCache cleanup" into oc-mr1-dev
am: b7072d6c59

Change-Id: Id7225a0bfb229ab3291066125d5dfffe5d6efb2e