Merge "Clarify license terms for Romain Guy's artwork." am: 035450a634 am: 0f4a0b62ea am: d2ec4f3b2e
am: eae057913c

Change-Id: I83b22e5ec814b8e7eb1326eb4396d7cde91d933e