change GCM to ADM
Merge pull request #2328 from hshiozawa/master

change GCM to ADM