Reviewed-by: rriggs, alanb, mchung, erikj, goetz
Removed references to classes that belong to desktop modules. Reviewed-by: ccheung, dholmes
Reviewed-by: darcy, ihse