Merge "Factor key blob management code out of message implementations"