[master 7/7] Update api to reflect changes from isolating installer-specific code.