merged upstream cm-11.0 into m7wls

Change-Id: Ia103eaeaf65da152c3f831361d6f2bc57d54bcde