Merge "Clarify license terms for Romain Guy's artwork." am: 17b630aa20 am: ace7e51e19
am: 3d291a6846

Change-Id: I46f9f39a91a62fc7f16313b156256de9e3963c32