Updates for cm-10.1

Change-Id: If25bfe2cf0bc8d2cb082bcbac1c4d9df7b841096