cm-10.1 bring up

Change-Id: I4265034291331e79a71cbd2923736e693675d2ac