Merge "fix a1-adapter-northbound startup"