Updates for cm-10.1

Change-Id: I2891274d285033b40065c401d367f7f81f4824f0