iOS 8 needs a couple changes to request location info.

Change-Id: Icfe9a8a2d8abc410846eb6b0b91f64898c995015
Merge "iOS 8 needs a couple changes to request location info."