Switched vendor_cm branch: gingerbread -> cm7