Merge "Update bmgr tool." into nyc-dev