merge from cm-11.0

Change-Id: If509669c7420d34edf8e2435e42883dde0ec8a19