import latest from M2DEV

Change-Id: Iebf2eb3a250b4ff7eef1d13a9416b4674d1d9a00
Merge "import latest from M2DEV" into cm-11.0