merge latest cm changes

Change-Id: Ib6d0bbdaca9022bf4482595f2b8d8626decf54b4