Merge "Clarify license terms for Romain Guy's artwork."
am: 11d96c6de8

Change-Id: I786fe5242bb697c1a874b5030d99be9255be0810