Merge "Use ukey2 for encryption runner." into qt-dev
am: 6941630526

Change-Id: Iae19302b6ad3932f55fd09f1a50da82f235df247