Merge "Fix ProfileSaver logging" into oc-dev
am: a2b84ef241

Change-Id: Ide0069449c2a6cef018169afa32fd03b12baf009