Merge "Add the provisioning extra admin extras bundle." into lmp-dev