Merge "Add build id as part of bugreport name." into nyc-dev