Merge "Clarify license terms for Romain Guy's artwork." am: d7645b2b82
am: 3842f20b1c

Change-Id: I0ea0efa3a110440b00390d1a308312a2ed104593