Merge "Clarify license terms for Romain Guy's artwork." am: 0e3bcf70c5 am: bcd745dddc
am: 3bdea97ab6

Change-Id: I1ca3f3809dd725e1763eea05864e7250408dc360