am 2788f617: Merge "Update support build for release." into klp-ub-dev

* commit '2788f617ee39b115201914d62aafbcd71094b056':
  Update support build for release.