Updates for 11.0

Change-Id: Ie3388de4e91262b7b8cd5c6949b9575e282baf1b
Merge branch 'cm-11.0' into martincz