Merge "Clarify license terms for Romain Guy's artwork." am: 17b630aa20 am: ace7e51e19 am: 3d291a6846
am: 2f03004c18

Change-Id: I1eca7f36b9c0aa7038931799ec4b071929ce768d