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

Change-Id: I5c2ec271babc92ac7bd46863fa03760e80afc170