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

* commit 'c49073d6a4f1d2349666b0b08de3b2dfbe995307':
  Fix and tune ProfileSaver

Change-Id: I49844766621d7c9230be6ec584a9ddf6eca5ea24