Improve profile merging error logging am: c0200a984c
am: ae5fe28197

Change-Id: I6b6e9918396b31ed07348c8dade0615e6890ce82