Merge "Do not unlink the profiles if not needed" into nyc-dev
am: 4820e72

* commit '4820e72dbfccad5974dc3d88f2cb462af35c6659':
  Do not unlink the profiles if not needed

Change-Id: I51ba64a994108143805e4d348ccfedfba5251f9e