Merge "Remove ability to set profilebootimage and profilesystemserver"