am 3a182ec1: Merge "Add the ability to unlock the bootloader before doing anything else"

* commit '3a182ec19f708859b672cbea69d9a749297244d8':
  Add the ability to unlock the bootloader before doing anything else