Merge "Update CREDITS and .mailmap" into REL1_31