Merge "Clarify license terms for Romain Guy's artwork." am: 9f56d51018 am: 95736c9fb6
am: 36daa700a0

Change-Id: I98b853ca96ae3af2f13b561b2949389d535f00f1