Merge "Changing wording to reflect c2dm shutdown." into lmp-docs