Merge "Discard corrupted or out of date profiles" into nyc-dev
am: 197a6a9

* commit '197a6a9a58b2e01aa89fba7741e9a01c2f4b7992':
  Discard corrupted or out of date profiles