Merge "Use HAS_BUILD_NUMBER to check engineering build"