Merge "Fix profile merges in profman"
am: 1e45a522ea

Change-Id: If488dd18668acecf4910d4503b7472fffc06776a