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

Change-Id: I83a46c560de9c336e0be06584aa444869f1022b4