Merge "Updating the sample to not use the old GooglePlayServicesClient." into lmp-mr1-ub-docs