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

Change-Id: I48ce71c405b3db3d26bc06717ffbc996729c86a4