Merge cm/cm-10.1

Change-Id: Iea254fbea41ea20e5ae7cf5279224bda511ef775