Google ends Motorola diversion, reverts to Plan A