Merge "Do not clear profiles after OTAs" into nyc-dev
am: 4ee1c943ab

* commit '4ee1c943ab5f7f69355d1413bca981812a804a67':
  Do not clear profiles after OTAs

Change-Id: Icf79d5c8eef4006fba3a5eb118d9882b02b36fb7