Updates for cm-10.1

Change-Id: Iebedc77a0b955238fbb9025660f99c237eb858b4