Manualy merge from cm-11.0

Change-Id: Ib3489e75997702d9c813277d6812f2e0ad3813f2