Merge "Clarify license terms for Romain Guy's artwork." am: 2a5ccebc1e am: 9890b01aee am: 70c6e8bd3f
am: 3b9f2d2eb5

Change-Id: Ica89a3edd20db6195582146bdf2674c529c7914a