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

Change-Id: I4e199050c7cc658a542da3ad3d5e4100f3348890