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

Change-Id: I2495f6b5019d1c6112d8c4cf00498f1d1fa48f61