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

Change-Id: If55d0b02392fabfa92e81522027831db210dbef6