Merge "Clarify license terms for Romain Guy's artwork." am: 0e3bcf70c5
am: bcd745dddc

Change-Id: I330e55df545251008c1940ec9b22732799de7fc5