Merge "Clarify license terms for Romain Guy's artwork." am: 0e3bcf70c5 am: bcd745dddc am: 3bdea97ab6
am: c28b70b393

Change-Id: I616ae4472eba5d76035837549ff28697887c5784