Merge "Clarify license terms for Romain Guy's artwork." am: dbc4a43cd9 am: d99cce0a4e am: defbc032e6
am: 616a4bd404

Change-Id: I9e2fe8cf186ff628fbfec255a583a519fb1d3277