Handle profile annotation during profman-merge am: ad88cbe5ac
am: 6543508686

Change-Id: I2a1f65c2dbd2b375fccf3454704c4c6740b994cc