Merge "Don't use upgrade-key-sets check when scanning during boot." into mnc-dev