cm-10.1 bring up

Change-Id: I77d3f24b75b3c3fbbe98679de437dd175704a0bc