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

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