latest cm changes

Change-Id: Ibd25210ff08e1858fc4552602d78a966efa05930