Changes in account profile management scenario

Change-Id: If30c2b9d357d7edb70d401f1bd4a1418b89ecdc8