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

Change-Id: I78383e6da13c7e4ad52f8edf3ef6a59108359bef