Merge "Tweak ProfileSaver saving strategy"
am: e685de7cd0

Change-Id: I828a8e80ba06056378b709ce202ff47a528f0460