Merge "Adjust ProfileSaver strategy" am: bd274fec10
am: 8eef62b13c

* commit '8eef62b13c86f8a539267cc54d4fe834c10f65bf':
  Adjust ProfileSaver strategy

Change-Id: I718c470c9955b4ac8088200cad3d7d3260a93832