Updates for cm-10.1

Change-Id: Ib96e15c7a7ce0f2611c4b5367ff6c26416cec9bf