Merge "Relax HMAC computation check" into pi-dev