New changes from CM 11 repo