Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
am: 6491b03410

Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab