Updates for cm-10.1

Change-Id: I2978315c34d4dbb09d67e8417547b5269743da12