Updates for cm-10.1

Change-Id: If70c205fbff4db6f5546cb2237536f63ffbc8be0