Merge "Address KeySet API Review" into lmp-dev