Merge "Tweak ProfileSaver saving strategy" am: e685de7cd0 am: ec8b0c88bb
am: a7a2cd604a

Change-Id: Ic72ff95337e8677443af3588d90462aa279afb2a