Merge "Clarify license terms for Romain Guy's artwork." am: 11d96c6d am: 3e4dd234 am: 5e4eb524 am: c01f1cee Change-Id: I9a496629c12bec03ca1b28b1ffdd04f0584e6c75