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

Change-Id: Idb11f8be1e893730036b8d48a4108ab87e78bb43