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

Change-Id: If97c3f85184886cc6b0be345db23eaa213a240ed