Merge "Bump buscontroller image (for working without AAF)"