Merge "Fixing tests to reflect new hmac key size limits" am: 577f2d717c am: b0d4f0b7a2
am: 0763817515

Change-Id: I993a241e6ddc963fc42efa512bedb08e93f52d6b