Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Add the standard LICENSE file Change-Id: I5c3b886e381ad89c09fcfff70d2dabcce35b0ec9