Merge "Adding framework check for 3DES key size" am: a24d025212
am: a68009941a

Change-Id: I53ab760b016544c0586a4d19a3e924ae899ae12e