Handle profile annotation during profman-merge
am: ad88cbe5ac

Change-Id: I4e1d9bfb3912e974761f39ef4869ade2aeba37d5