some updates from CM

Change-Id: Ibe546880493e3ec1f587bc7c2d4e4a9f5e4eff66