Merge "Clarify license terms for Romain Guy's artwork." am: dbc4a43cd9
am: d99cce0a4e

Change-Id: I41cf195efb959507f7444b02013054e9c4e6273a