Merge "Clarify license terms for Romain Guy's artwork." am: 11d96c6de8 am: 3e4dd234e7 am: 5e4eb52422
am: c01f1cee70

Change-Id: I9a496629c12bec03ca1b28b1ffdd04f0584e6c75