merge from cm

Change-Id: I0063ff83401cc9bcf12469a1c2b933064028971b