Updates for cm-10.1

Change-Id: I5041747966dfed88a97c35e2050f833e5879f4ef