Merge "Correct bug in HmacKeySharingTest" into pi-dev