Improve profile merging error logging
am: c0200a984c

Change-Id: I232cce20d2c2d7351bb2d6b3999ac0970331ac0c