Merge "Make servicemanager use "bootstrap" bionic"