Add GCM cipher and remove DES

Change-Id: I2e2253beb69f999491b4add64d9b101bf53effbd
Merge "Add GCM cipher and remove DES" into production