Updates for 11.0

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