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

Change-Id: I2ee40a6c22a1bfe58ca107790719c5695aa7c774