Merge "Fix and tune ProfileSaver" into nyc-dev
am: cbb3251

* commit 'cbb3251dc8f906c33c884380548c24ecd90a7d94':
  Fix and tune ProfileSaver

Change-Id: I3fc2d2975b3ad013fede7f8c24d36d9efb2d6a9c