am 6cc9755b: Update device for new location provider configs.

* commit '6cc9755baac9cde9b1327cd090c5d6bea6dbbb00':
  Update device for new location provider configs.