Merge "OTA Tools: Handle password encrypted keys"
am: 4e1c113554

Change-Id: Icc7400eb9369f5d6e3551914f5cae0ac2c923cea