6.0.2.9

Change-Id: Ib39519bb312c234b1092c067957c50d6c522ba49
Merge remote branch 'cm/cm-10.1' into jb