merge cm changes

Change-Id: I27aa3fa50d589ae329aa4cf5fcef6b715cdbc1cd