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

Change-Id: I8c35bf0652f4043c23dbca3f682d23b72c7a0ace