Merge "Add allowRedundantMoreKeys attribute"