Merge branch 'stable-2.10'

* stable-2.10:
  Fix license generation

Change-Id: I13ecad4191eee92ce9daa863d635cfe3cd9d6abb