Merge "Updating accepted HMAC key sizes" am: 1cf90f78f1
am: 7f813b80d3

Change-Id: I54e1a756120090113588be39e861c71b55766c62