Merge "No need to remove profile encryption key on boot"