Merge into cm10.2 bringup