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

Change-Id: Icee5ce1f2dfa1f88bb2c4ac9975849a23b024eee