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

* commit '41a7ba0e7183fc37a59a19a317f2b3535e0ee34a':
  Discard corrupted or out of date profiles