Merge "CommentStore: Hard-deprecate newKey()"