JCLOUDS-41: Using builder.build(context) instead of an explicit cast
  Aligns the change made in c94ed110a with the code in 1.6.x