am 80faaa35: am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev

* commit '80faaa3558a6d21990ae6bcf24eb7f8015db710f':
  Avoid NPE in GpsLocationProvider