Merge changes from topics "141018421_set3", "146905502"

* changes:
  Rename sanitizeLocationInfo as we make it System API.
  For some scenarios where NOT_READY is a final / steady state. Clear config.