Merge "Clarify license terms for Romain Guy's artwork." am: 2a5ccebc1e
am: 9890b01aee

Change-Id: I47f7e03dbc09f79008b95ddb47d6ab3ca083816f