Merge branch 'stable-2.11' * stable-2.11: Define local licenses Change-Id: I6b7bf2da27ee372eff5a803728b029b9a67a0c51