Merge "FP2-84: remove the default build id" into fp2-dev