am: c49073d6 * commit 'c49073d6': Fix and tune ProfileSaver Change-Id: I49844766621d7c9230be6ec584a9ddf6eca5ea24