merge from cm

Change-Id: Ibc9bdc04632a9676513a10649f64d7f865a40f9d