Cm10.2 bringup

Pulling in your changes ;) .