Merge "Adjust ProfileSaver strategy"
am: bd274fec10

* commit 'bd274fec102dc9652b6c3b7aef2e2401d27bb15b':
  Adjust ProfileSaver strategy

Change-Id: If1f26241bd12e7a56838570f0bb46cd79e5c2a16