Merge "Clarify license terms for Romain Guy's artwork." am: a37de64bd6 am: fb5f7546b0 am: 801760580f
am: 78ef94715c

Change-Id: Ic6d304bab837f858f662bbb2542421caa7f2ca60