Merge "Track change from GCM -> AES/GCM/NoPadding"