Merge "Clarify license terms for Romain Guy's artwork." am: 9f56d51018
am: 95736c9fb6

Change-Id: I0531e1cdaf4eacc7dcb032acaa6204df95033526