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

Change-Id: I29dbb2db84696ba4ad7433ba9d99119572ede665