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

Change-Id: Ibe132b66efdb875c985e35869142832fb2f8c04c