Merge "Update manifest for buscontroller"