Merge "Correct UseHmacKey parameter" into rvc-dev am: ecd5e55cc1

Change-Id: I25bb8b4d25ad963d33ee0a91e89465011bee609f