updates from cm

Change-Id: Ifff90ce8c7763c646dcf4c563dbd887908164d0f