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

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