Merge "OTA Tools: Handle password encrypted keys" am: 4e1c113554 am: c3947ece97 am: 686c732c63
am: df8e605204

Change-Id: I900e55703536683cf1a7117a8b702d4673ee49dc