Merge "Clarify license terms for Romain Guy's artwork." am: 15344331c5 am: 88995dfb74
am: 8427e65955

Change-Id: I2d91976d9d395cfb496e9e3d32e0e1b06230f128