am 1a3048f3: Merge "Don\'t use upgrade-key-sets check when scanning during boot." into mnc-dev

* commit '1a3048f3677680823b52d3b0d538917d08da8495':
  Don't use upgrade-key-sets check when scanning during boot.