Merge "Clarify license terms for Romain Guy's artwork." am: d7645b2b82 am: 3842f20b1c am: fe5ea80069
am: cc643b41ea

Change-Id: Ia9bdd669d9e08e3b7c28282d1ecd62abee17cd6d