Merge "Actually use --copy-and-update-profile-key argument in profman..." am: 29d4cc0097
am: 811c98ed55

Change-Id: I074464ccfc1335b7992e6ed57ae6437f77765954