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

Change-Id: Ifdb3d47cc260341aca28b5c6c20519e7954c0c6d