Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195
am: e30cfbea60

Change-Id: Iaff6653418289136e24b4a1c16ee4e607d30dca0