Big update: Bringup of "stable" CM9 tree into CM7