Merge "Do not cache profiles in the ProfileSaver." am: ee810b376d
am: df5b6a3fed

Change-Id: I6f5b73ac8992dde10448bdcca62f57d816d47fea