Merge "Fix the inconsistency of scan status." into oc-dr1-dev
am: 231e291b06  -s ours

Change-Id: I5faaa2f7589ceaa68bf7ae21c065e2dce0621286