Merge "Clarify license terms for Romain Guy's artwork." am: 035450a634 am: 0f4a0b62ea
am: d2ec4f3b2e

Change-Id: Ibf4d164aef3c1ee1708b82d684cb56f7404dec43