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

Change-Id: Idcb4be40769f2b82ec99632a008bc1bd5ccd806d